Install dtd into correct place
authorTom Wilkie <tom.wilkie@gmail.com>
Fri, 13 Apr 2007 15:54:03 +0000 (16:54 +0100)
committerTom Wilkie <tom.wilkie@gmail.com>
Fri, 13 Apr 2007 15:54:03 +0000 (16:54 +0100)
signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

tools/python/Makefile
tools/python/xen/xm/xenapi_create.py

index 309c815352c71ea362b3d7ce2baa5a58b034a5a3..469a4e9af00728ac184d8172cc55081831f2d131 100644 (file)
@@ -56,13 +56,16 @@ refresh-po: $(POTFILE)
 .PHONY: install
 ifndef XEN_PYTHON_NATIVE_INSTALL
 install: LIBPATH=$(shell PYTHONPATH=xen/util python -c "import auxbin; print auxbin.libpath()")
-install: install-messages
+install: install-messages install-dtd
        CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --force --install-lib="$(DESTDIR)$(LIBPATH)/python"
 else
-install: install-messages
+install: install-messages install-dtd
        CC="$(CC)" CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --force
 endif
 
+install-dtd: all
+       $(INSTALL) -m 755 xen/xm/create.dtd $(DESTDIR)/usr/share/xen
+
 install-messages: all
        if which $(MSGFMT) >/dev/null ; then \
                mkdir -p $(DESTDIR)$(NLSDIR); \
index 19ced84460365c9572e4d8af4cb406eb294cdcab..4e8d6c46032bd39e4d0dd12bd7619b2307ec0171 100644 (file)
@@ -72,7 +72,7 @@ class xenapi_create:
     def __init__(self):
         self.DEFAULT_STORAGE_REPOSITORY = get_default_SR()
 
-        self.dtd = "/usr/lib/python/xen/xm/create.dtd"
+        self.dtd = "/usr/share/xen/create.dtd"
 
     def create(self, filename=None, document=None, skipdtd=False):
         """